Merge remote branch 'origin/upstream-cvs' into upstream
authorBernd Zeimetz <bernd@bzed.de>
Sun, 2 May 2010 11:28:30 +0000 (13:28 +0200)
committerBernd Zeimetz <bernd@bzed.de>
Sun, 2 May 2010 11:28:30 +0000 (13:28 +0200)
commit05ad24ecfb9af51145cb21c278c7ecede8280ce7
tree43cf3d368966af2283d89de0102e2726b7539b1b
parentcc2cc104f9b1addb0b00b4f97de3f156468dfbfb
parent95bcd67cbd4e31d04d61a4c735b3ea33190e1916
Merge remote branch 'origin/upstream-cvs' into upstream